Auto merge of #1425 - alexcrichton:issue-1421, r=huonw
authorbors <bors@rust-lang.org>
Mon, 16 Mar 2015 13:47:04 +0000 (13:47 +0000)
committerbors <bors@rust-lang.org>
Mon, 16 Mar 2015 13:47:04 +0000 (13:47 +0000)
commite689383e32f1e206c3740ce2989fce08b5a59998
treea403daa65af02518be35823d769bd52c6d763dab
parent2d2e039339ef36efd7bba02fc8cd3b793dda46c6
parent2ff5f53b98d13b5ae05c84ab2cd13c2774a6e4f1
Auto merge of #1425 - alexcrichton:issue-1421, r=huonw

This was accidentally broken in a recent refactoring.

Closes #1421